Merge vcpuop compat header creation

Signed-off-by: Emmanuel Ackaouy <ack@xensource.com>

diff --git a/xen/include/Makefile b/xen/include/Makefile
index 416c3a8fee3baeb97f5693d712aa6ae3d7a13643..d2efb237c34dfa77a4e8ffb34f9ba5c4c4a09278 100644 (file)
--- a/xen/include/Makefile
+++ b/xen/include/Makefile
@@ -4,6 +4,8 @@ compat-arch-$(CONFIG_X86) := x86_32
 
 headers-y                 := $(shell echo public/*.h | sed -e 's,[^[:space:]]*-[^[:space:]]*,,g' -e 's,public/,compat/,g')
 headers-y                 := $(filter-out %/dom0_ops.h,$(headers-y))
+headers-$(CONFIG_X86)     += compat/arch-x86/xen.h
+headers-$(CONFIG_X86)     += compat/arch-x86/xen-$(compat-arch-y).h
 headers-y                 += compat/arch-$(compat-arch-y).h compat/xlat.h
 
 cppflags-y                := -include public/xen-compat.h

diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst
index bfd017b7443722a0a9a85f8aeed51e1c6bd9050f..df786c0d53a59c809f1080a0b9a108b9c3205a74 100644 (file)
--- a/xen/include/xlat.lst
+++ b/xen/include/xlat.lst
@@ -6,9 +6,9 @@
 !      mmuext_op                       xen.h
 !      start_info                      xen.h
 ?      vcpu_time_info                  xen.h
-!      cpu_user_regs                   arch-@arch@.h
-!      trap_info                       arch-@arch@.h
-!      vcpu_guest_context              arch-@arch@.h
+!      cpu_user_regs                   arch-x86/xen-@arch@.h
+!      trap_info                       arch-x86/xen.h
+!      vcpu_guest_context              arch-x86/xen.h
 ?      evtchn_alloc_unbound            event_channel.h
 ?      evtchn_bind_interdomain         event_channel.h
 ?      evtchn_bind_ipi                 event_channel.h